Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 01:35:20 +0000 (17:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 01:35:20 +0000 (17:35 -0800)
commitba1b82b416f05271d5d77d454e303f6946276607
tree64f31828dc608b1631fa8dffb5e9aeef56674fc2
parent6139518d89b46223758c5b9b09f2bafc414fe9cc
parentdcfbfc6f81963e43dee0f4082c2ea06544ff0141
Merge from mainline.
ChangeLog
src/ChangeLog